bitkeeper revision 1.1346.1.1 (42670505dNhgnJm5dQD81pCalXMZgw)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 21 Apr 2005 01:42:29 +0000 (01:42 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 21 Apr 2005 01:42:29 +0000 (01:42 +0000)
commite631a47cf600b0b5b46026756d6764fb6c9847c3
tree6d3575a1903dd1d1dc4bed4e7e3fd38faa463d95
parent10eba6b169bae7e93b59f5c6eba8c32ed4bd5069
parent8b521bdf6b4b707bcdacb4f1d428924b8a5453e4
bitkeeper revision 1.1346.1.1 (42670505dNhgnJm5dQD81pCalXMZgw)

manual merge
.rootkeys
tools/libxc/Makefile
tools/libxc/xc.h
tools/python/xen/lowlevel/xc/xc.c
tools/python/xen/xend/XendClient.py
tools/python/xen/xend/XendDomain.py
tools/python/xen/xend/server/SrvDomain.py
tools/python/xen/xm/main.py
xen/common/schedule.c
xen/include/public/sched_ctl.h
xen/include/xen/sched-if.h